Re-design the QEMU home page to better present information
v2 cover Re-design the QEMU home page to better present information
This is a v2 of:
https://lists.gnu.org/archive/html/qemu-devel/2020-10/msg07025.html
This series started off as a desire to add an "Edit page" link to every page on the site. In doing this I felt that the footer would benefit from simplication so that it was not a massive wall of links, duplicating links elsewhere in the navigation or content pages. Then after response to v1, I realized that the home page actually needed alot more design work to better present information to contributors immediately.
The key theme was to ensure that the home page of the website has all the important information available on screen without requiring the user to scroll down or otherwise search for it.
I also add gitlab CI jobs so that users can push a branch to gitlab and then browse the rendered result.
eg see this pipeline:
https://gitlab.com/berrange/qemu-web/-/pipelines/208194087
and the rendered result of this series:
https://berrange.gitlab.io/qemu-web/
Or browsable at
https://gitlab.com/berrange/qemu-web/-/jobs/814392582/artifacts/browse/publ=
ic/
Or download ZIP at
https://gitlab.com/berrange/qemu-web/-/jobs/814392582/artifacts/download
notice how the resulting content needs to cope with being used from a variety of different paths. IOW, we cannot use absolute hyperlinks that assume the root is "/". Jekyll doesn't make this easy, so we use a hack with a custom template that sets a variable we can then reference.
The logical next step for this would be to accept merge requests, so that once the user saves their edits in gitlab, they can directly submit a MR, instead of sending via email. I noticed we don't currently have a CONTRIBUTING.md file in qemu-web.git telling people how to submit. So this series includes such a file directing people to send patches via email for now.
Daniel P. Berrang=C3=A9 (16):
Convert files to UNIX line endings
gitlab: introduce a CI job to publish the site content make all links be relative to the root
Make page header nav narrower
Introduce support for "bxslider" jquery add on Rework display of screenshots to use a carousel slider Compress the two front page headings into one Simplify copyright and integrate into footer
Put a full SFC membership blurb in footer of every page Use two column layout to display screenshots and releases Bring contribution links out of the footer into the home page Add recent blog posts to the front page featured content Move wiki link from footer into the header navbar Simplify and restructure the page footer
Add link to "page source" for all pages
Add a CONTRIBUTING.md file as guidance for contributors
.gitlab-ci.yml | 16 + CONTRIBUTING.md | 32 + _config.yml | 1 + _data/screenshots.yml | 14 +- _includes/assets.html | 32 +- _includes/copyright.html | 8 - _includes/footer.html | 33 +- _includes/nav.html | 13 +- _includes/relative_root.html | 12 + _includes/screenshot.html | 8 +- _includes/sidebar.html | 6 +- _layouts/archive.html | 4 +- _layouts/blog.html | 4 +- _layouts/home.html | 2 +- _layouts/page.html | 2 +- assets/css/jquery.bxslider.css | 179 ++++ assets/css/style-desktop.css | 581 ++++++------ assets/css/style-mobile.css | 720 +++++++------- assets/css/style.css | 1252 +++++++++++++------------ assets/js/jquery.bxslider.js | 1607 ++++++++++++++++++++++++++++++++ blog/index.html | 4 +- index.html | 195 ++-- 22 files changed, 3312 insertions(+), 1413 deletions(-) create mode 100644 .gitlab-ci.yml create mode 100644 CONTRIBUTING.md delete mode 100644 _includes/copyright.html create mode 100644 _includes/relative_root.html create mode 100644 assets/css/jquery.bxslider.css create mode 100644 assets/js/jquery.bxslider.js
--=20
2.26.2
PATCH v2 1/16 Convert files to UNIX line endings
--- assets/css/style-desktop.css | 586 ++++++++--------- assets/css/style-mobile.css | 750 ++++++++++----------- assets/css/style.css | 1184 +++++++++++++++++----------------- index.html | 178 ++--- 4 files changed, 1349 insertions(+), 1349 deletions(-)
assets/css/style-desktop.css +293 -293
@@ -1,295 +1,295 @@ -/* - Linear by TEMPLATED - templated.co @templatedco - Released for free under the Creative Commons Attribution 3.0 license (templated.co/license) -*/ - -/*********************************************************************************/ -/* Grid */ -/*********************************************************************************/ - -@import url(cells.css); - - .row > * { - padding-left: 50px; - } - .row > *:first-child { - padding-left: 0px; - } - .row + .row { - padding-top: 50px; - } - -/*********************************************************************************/ -/* Basic */ -/*********************************************************************************/ - - .only-mobile, .not-desktop - { - display: none !important; - } - - body - { - /* 90% transparent */ - background: url(../images/qemu_head_200.png) no-repeat fixed 2em 80px; +/* + Linear by TEMPLATED + templated.co @templatedco + Released for free under the Creative Commons Attribution 3.0 license (templated.co/license) +*/ + +/*********************************************************************************/ +/* Grid */ +/*********************************************************************************/ + +@import url(cells.css); + + .row > * { + padding-left: 50px; + } + .row > *:first-child { + padding-left: 0px; + } + .row + .row { + padding-top: 50px; + } + +/*********************************************************************************/ +/* Basic */ +/*********************************************************************************/ + + .only-mobile, .not-desktop + { + display: none !important; + } + + body + { + /* 90% transparent */ + background: url(../images/qemu_head_200.png) no-repeat fixed 2em 80px; background-color: #FFF; - } - - body.homepage - { - /* 90% transparent */ - background: url(../images/qemu_head_400_faint.png) no-repeat fixed center 60%; + } + + body.homepage + { + /* 90% transparent */ + background: url(../images/qemu_head_400_faint.png) no-repeat fixed center 60%; background-color: #FFF; - } - - body,input,textarea,select - { - } - - .homepage h1 - { - font-size: 7em; - letter-spacing: -0.05em; - } - - .homepage h2 - { - font-size: 2.2em; - } - - h1 - { - font-size: 3em; - } - - header - { - margin-bottom: 2em; - } - - header .byline - { - font-size: 1.7em; - } - -/*********************************************************************************/ -/* Header */ -/*********************************************************************************/ - - #header - { - padding: 5em 0 2em 0; - } - -/*********************************************************************************/ -/* Main */ -/*********************************************************************************/ - - #main,#sidebar { - margin-top: 5em; - } - - #sidebar h1 - { - font-size: 2.4em; - letter-spacing: 0em; - line-height: 1.2em; - margin-top: -0.2em; - } - -/*********************************************************************************/ -/* Footer */ -/*********************************************************************************/ - - #footer - { - padding: 1em 0em; - } - - #footer-inner - { - width: 95%; - display: table; - margin: auto; - } - - #footer ul - { - width: 25%; - display: table-cell; - padding-left: 2em; - } - - #footer ul:first-child - { - padding-left: 0px; - } - -/*********************************************************************************/ -/* Featured */ -/*********************************************************************************/ - - #featured - { - padding: 3em 0em 1em 0em; - } - - #featured p - { - line-height: 1.5em; - font-size: 1.2em; - } - - .\31 u img { height: 6vw; } - .\32 u img { height: 12vw; } - .\33 u img { height: 18vw; } - .\34 u img { height: 24vw; } - .\36 u img { height: 36vw; } - .\37 u img { height: 42vw; } - .\38 u img { height: 48vw; } - .\39 u img { height: 54vw; } - .\31 0u img { height: 60vw; } - .\31 1u img { height: 66vw; } - .\31 2u img { height: 72vw; } - -/*********************************************************************************/ -/* Horizontal menu */ -/*********************************************************************************/ - .horiz-menu > ul - { - width: 100%; - margin: 0; - padding: 0; - display: table; - border-collapse: collapse; - } - .horiz-menu > ul > li - { - width: 25%; - border: 1px solid #000000; - display: table-cell; - color: #F03B11; - } - .horiz-menu > ul > li:hover - { - background: #FCECD4; - color: #802400; - } - - .horiz-menu > ul > li > a - { - display: block; - padding: 1em; - border-bottom: 5px transparent; - white-space: nowrap; - color: inherit; - } - .horiz-menu > ul > li > a:hover - { - text-decoration: none; - } - .horiz-menu > ul > li.active > a - { - border-bottom: 5px #F03B11 solid; - } - - .horiz-menu > ul > li.active > a:hover - { - border-bottom: 5px #802400 solid; - } - - .horiz-menu > article - { - padding-top: 1em; - margin: 0; - display: none; - } - - .horiz-menu > article.active - { - display: block; - } - -/*********************************************************************************/ -/* Nav */ -/*********************************************************************************/ - - #titleBar - { - display: none !important; - } - - #nav - { - display: block !important; - z-index: 2; - position: fixed; - background: #802400; - background: -webkit-linear-gradient(top, #802400 0%,#800800 100%); - background: linear-gradient(to bottom, #802400 0%,#800800 100%); - left: 0; - top: 0; - width: 100%; - } - - #nav > ul - { - text-align: right; - margin: 0; - } - - #nav > ul > li - { - display: inline-block; - margin: 0; - padding: 0.5em 2em 0.5em 0em; - color: #FFF; - letter-spacing: 0.06em; - text-transform: uppercase; - font-size: 1.1em; - } - - #nav a - { - text-decoration: none; - color: inherit; - } - - #nav > ul > li > a, - #nav > ul > li > span - { - display: inline-block; - padding: 3px 0.5em 3px 0.5em; - } - - #nav > ul > li:hover > a, - #nav > ul > li:hover > span - { - border-bottom: 3px solid #F0A833; - padding-bottom: 0px; - } - - #nav li.current a - { - font-weight: 500; - } - -/* - #nav > ul > li.home - { - display: block; - float: left; - } -*/ - - #nav > ul > li > ul - { - display: none; - } - - -/* Colorbox customization */ - - body #cboxTitle { height: 50px; bottom: 24px; color: #000000; text-align: left; } - body #cboxMiddleLeft, body #cboxMiddleRight, body #cboxContent { padding-bottom: 50px; box-sizing: content-box; } + } + + body,input,textarea,select + { + } + + .homepage h1 + { + font-size: 7em; + letter-spacing: -0.05em; + } + + .homepage h2 + { + font-size: 2.2em; + } + + h1 + { + font-size: 3em; + } + + header + { + margin-bottom: 2em; + } + + header .byline + { + font-size: 1.7em; + } + +/*********************************************************************************/ +/* Header */ +/*********************************************************************************/ + + #header + { + padding: 5em 0 2em 0; + } + +/*********************************************************************************/ +/* Main */ +/*********************************************************************************/ + + #main,#sidebar { + margin-top: 5em; + } + + #sidebar h1 + { + font-size: 2.4em; + letter-spacing: 0em; + line-height: 1.2em; + margin-top: -0.2em; + } + +/*********************************************************************************/ +/* Footer */ +/*********************************************************************************/ + + #footer + { + padding: 1em 0em; + } + + #footer-inner + { + width: 95%; + display: table; + margin: auto; + } + + #footer ul + { + width: 25%; + display: table-cell; + padding-left: 2em; + } + + #footer ul:first-child + { + padding-left: 0px; + } + +/*********************************************************************************/ +/* Featured */ +/*********************************************************************************/ + + #featured + { + padding: 3em 0em 1em 0em; + } + + #featured p + { + line-height: 1.5em; + font-size: 1.2em; + } + + .\31 u img { height: 6vw; } + .\32 u img { height: 12vw; } + .\33 u img { height: 18vw; } + .\34 u img { height: 24vw; } + .\36 u img { height: 36vw; } + .\37 u img { height: 42vw; } + .\38 u img { height: 48vw; } + .\39 u img { height: 54vw; } + .\31 0u img { height: 60vw; } + .\31 1u img { height: 66vw; } + .\31 2u img { height: 72vw; } + +/*********************************************************************************/ +/* Horizontal menu */ +/*********************************************************************************/ + .horiz-menu > ul + { + width: 100%; + margin: 0; + padding: 0; + display: table; + border-collapse: collapse; + } + .horiz-menu > ul > li + { + width: 25%; + border: 1px solid #000000; + display: table-cell; + color: #F03B11; + } + .horiz-menu > ul > li:hover + { + background: #FCECD4; + color: #802400; + } + + .horiz-menu > ul > li > a + { + display: block; + padding: 1em; + border-bottom: 5px transparent; + white-space: nowrap; + color: inherit; + } + .horiz-menu > ul > li > a:hover + { + text-decoration: none; + } + .horiz-menu > ul > li.active > a + { + border-bottom: 5px #F03B11 solid; + } + + .horiz-menu > ul > li.active > a:hover + { + border-bottom: 5px #802400 solid; + } + + .horiz-menu > article + { + padding-top: 1em; + margin: 0; + display: none; + } + + .horiz-menu > article.active + { + display: block; + } + +/*********************************************************************************/ +/* Nav */ +/*********************************************************************************/ + + #titleBar + { + display: none !important; + } + + #nav + { + display: block !important; + z-index: 2; + position: fixed; + background: #802400; + background: -webkit-linear-gradient(top, #802400 0%,#800800 100%); + background: linear-gradient(to bottom, #802400 0%,#800800 100%); + left: 0; + top: 0; + width: 100%; + } + + #nav > ul + { + text-align: right; + margin: 0; + } + + #nav > ul > li + { + display: inline-block; + margin: 0; + padding: 0.5em 2em 0.5em 0em; + color: #FFF; + letter-spacing: 0.06em; + text-transform: uppercase; + font-size: 1.1em; + } + + #nav a + { + text-decoration: none; + color: inherit; + } + + #nav > ul > li > a, + #nav > ul > li > span + { + display: inline-block; + padding: 3px 0.5em 3px 0.5em; + } + + #nav > ul > li:hover > a, + #nav > ul > li:hover > span + { + border-bottom: 3px solid #F0A833; + padding-bottom: 0px; + } + + #nav li.current a + { + font-weight: 500; + } + +/* + #nav > ul > li.home + { + display: block; + float: left; + } +*/ + + #nav > ul > li > ul + { + display: none; + } + + +/* Colorbox customization */ + + body #cboxTitle { height: 50px; bottom: 24px; color: #000000; text-align: left; } + body #cboxMiddleLeft, body #cboxMiddleRight, body #cboxContent { padding-bottom: 50px; box-sizing: content-box; }
assets/css/style-mobile.css +375 -375
750 lines not on this page · raw message
assets/css/style.css +592 -592
1,184 lines not on this page · raw message
index.html +89 -89
178 lines not on this page · raw message
Signature · 1 line
2.26.2
Re: [qemu-web PATCH v2 01/16] Convert files to UNIX line endings
Quoted 7 lines · Daniel P. Berrangé
Signed-off-by Daniel P. Berrangé <[email protected]>--- assets/css/style-desktop.css | 586 ++++++++--------- assets/css/style-mobile.css | 750 ++++++++++----------- assets/css/style.css | 1184 +++++++++++++++++----------------- index.html | 178 ++--- 4 files changed, 1349 insertions(+), 1349 deletions(-)
git am complains:
.git/rebase-apply/patch:62: trailing whitespace.
} .git/rebase-apply/patch:68: trailing whitespace. }
.git/rebase-apply/patch:375: trailing whitespace.
.git/rebase-apply/patch:409: trailing whitespace.
.git/rebase-apply/patch:414: trailing whitespace.
warning: squelched 57 whitespace errors
warning: 62 lines add whitespace errors.
... so in case you respin, please fix these trailing whitespaces, too.
Thomas
PATCH v2 2/16 gitlab: introduce a CI job to publish the site content
In reply to Daniel P. Berrangé--- .gitlab-ci.yml | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) create mode 100644 .gitlab-ci.yml
.gitlab-ci.yml new file +16 -0
@@ -0,0 +1,16 @@ + +pages: + image: centos:8 + cache: + paths: + - vendor + before_script: + - dnf install -y ruby ruby-devel rubygem-bundler openssl-devel + - dnf install -y gcc gcc-c++ make redhat-rpm-config + - bundle install --path vendor + script: + - bundle exec jekyll build + - mv _site public + artifacts: + paths: + - public
Signature · 1 line
2.26.2
PATCH v2 3/16 make all links be relative to the root
In reply to Daniel P. BerrangéThis enables the site to be hosted at URLs with different base directories. This is useful when viewing the site after being published as GitLab CI artifacts.
--- _includes/assets.html | 28 ++++++++++++++-------------- _includes/copyright.html | 2 +- _includes/footer.html | 12 ++++++------ _includes/nav.html | 12 ++++++------ _includes/relative_root.html | 12 ++++++++++++ _includes/sidebar.html | 6 +++--- _layouts/archive.html | 4 ++-- _layouts/blog.html | 3 ++- _layouts/home.html | 1 + _layouts/page.html | 1 + blog/index.html | 4 ++-- index.html | 5 +++-- 12 files changed, 53 insertions(+), 37 deletions(-) create mode 100644 _includes/relative_root.html
_includes/assets.html +14 -14
@@ -4,23 +4,23 @@ <meta name="viewport" content="width=device-width"> <link href='https://fonts.googleapis.com/css?family=Roboto+Mono:300,400%7cRoboto:300,400,500' rel='stylesheet' type='text/css'> - <link rel="apple-touch-icon" sizes="180x180" href="/assets/favicons/apple-touch-icon.png"> - <link rel="icon" type="image/png" sizes="32x32" href="/assets/favicons/favicon-32x32.png"> - <link rel="icon" type="image/png" sizes="16x16" href="/assets/favicons/favicon-16x16.png"> - <link rel="manifest" href="/assets/favicons/manifest.json"> - <link rel="mask-icon" href="/assets/favicons/safari-pinned-tab.svg" color="#5bbad5"> - <meta name="msapplication-config" content="/assets/favicons/browserconfig.xml"> + <link rel="apple-touch-icon" sizes="180x180" href="{{ relative_root }}/assets/favicons/apple-touch-icon.png"> + <link rel="icon" type="image/png" sizes="32x32" href="{{ relative_root }}/assets/favicons/favicon-32x32.png"> + <link rel="icon" type="image/png" sizes="16x16" href="{{ relative_root }}/assets/favicons/favicon-16x16.png"> + <link rel="manifest" href="{{ relative_root }}/assets/favicons/manifest.json"> + <link rel="mask-icon" href="{{ relative_root }}/assets/favicons/safari-pinned-tab.svg" color="#5bbad5"> + <meta name="msapplication-config" content="{{ relative_root }}/assets/favicons/browserconfig.xml"> <meta name="theme-color" content="#ffffff"> - <link rel="stylesheet" href="/assets/css/normalize.css" /> + <link rel="stylesheet" href="{{ relative_root }}/assets/css/normalize.css" /> <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/font-awesome/4.6.3/css/font-awesome.min.css" /> - <link rel="stylesheet" href="/assets/css/skel-noscript.css" /> - <link rel="stylesheet" href="/assets/css/style.css" /> - <link rel="stylesheet" href="/assets/css/style-mobile.css" media="(max-width:699px)"/> - <link rel="stylesheet" href="/assets/css/style-desktop.css" media="(min-width:700px)" /> - <link rel="alternate" title="QEMU Blog (Atom feed)" href="/feed.xml" type="application/atom+xml" /> + <link rel="stylesheet" href="{{ relative_root }}/assets/css/skel-noscript.css" /> + <link rel="stylesheet" href="{{ relative_root }}/assets/css/style.css" /> + <link rel="stylesheet" href="{{ relative_root }}/assets/css/style-mobile.css" media="(max-width:699px)"/> + <link rel="stylesheet" href="{{ relative_root }}/assets/css/style-desktop.css" media="(min-width:700px)" /> + <link rel="alternate" title="QEMU Blog (Atom feed)" href="{{ relative_root }}/feed.xml" type="application/atom+xml" /> <script src="https://ajax.googleapis.com/ajax/libs/jquery/1.11.0/jquery.min.js"></script> {% if page.colorbox %} - <script src="/assets/js/jquery.colorbox.js"></script> - <link rel="stylesheet" href="/assets/css/colorbox.css" /> + <script src="{{ relative_root }}/assets/js/jquery.colorbox.js"></script> + <link rel="stylesheet" href="{{ relative_root }}/assets/css/colorbox.css" /> {% endif %}
_includes/copyright.html +1 -1
@@ -2,7 +2,7 @@ <div id="copyright-inner"> <div class="container"> This site is made available under the terms of - <a href="/license.html">a number of licenses</a>. + <a href="{{ relative_root }}/license.html">a number of licenses</a>. </div> </div> </div>
_includes/footer.html +6 -6
@@ -1,20 +1,20 @@ <div id="footer"> <div id="footer-inner"> <ul class="style"> - <li><a href="/">Home</a></li> - <li><a href="/download">Download</a></li> - <li><a href="/conservancy/">Conservancy / Committee</a></li> + <li><a href="{{ relative_root }}/">Home</a></li> + <li><a href="{{ relative_root }}/download">Download</a></li> + <li><a href="{{ relative_root }}/conservancy/">Conservancy / Committee</a></li> <li><a href="http://qemu-advent-calendar.org">QEMU advent calendar</a></li> </ul> <ul class="style"> - <li><a href="/contribute">Contribute</a></li> - <li><a href="/contribute/report-a-bug">Reporting a bug</a></li> + <li><a href="{{ relative_root }}/contribute">Contribute</a></li> + <li><a href="{{ relative_root }}/contribute/report-a-bug">Reporting a bug</a></li> <li><a href="https://wiki.qemu.org/Documentation/GettingStartedDevelopers">New contributors</a></li> <li><a href="https://wiki.qemu.org/Contribute/SubmitAPatch">Submitting a patch</a></li> <li><a href="https://wiki.qemu.org/Contribute/FAQ">Contributor FAQ</a></li> </ul> <ul class="style"> - <li><a href="/documentation">Documentation</a></li> + <li><a href="{{ relative_root }}/documentation">Documentation</a></li> <li><a href="https://www.qemu.org/docs/master/">Main docs</a></li> <li><a href="https://wiki.qemu.org/Category:Developer_documentation">Developer docs</a></li> <li><a href="https://wiki.qemu.org/">Wiki</a></li>
_includes/nav.html +6 -6
@@ -2,12 +2,12 @@ <nav id="nav"> <ul> {% assign current = page.url | downcase | split: '/' %} - <li class='{% if page.url == '/' %}not-desktop {%endif %}home'><a href="/">Home</a> - </li><li {% if current[1] == 'download' %}class='current'{% endif %}><a href="/download">Download</a> - </li><li {% if current[1] == 'support' %}class='current'{% endif %}><a href="/support">Support</a> - </li><li {% if current[1] == 'contribute' %}class='current'{% endif %}><a href="/contribute">Contribute</a> - </li><li {% if current[1] == 'documentation' %}class='current'{% endif %}><a href="/documentation">Documentation</a> - </li><li {% if current[1] == 'blog' %}class='current'{% endif %}><a href="/blog">Blog</a></li> + <li class='{% if page.url == '/' %}not-desktop {%endif %}home'><a href="{{ relative_root }}/">Home</a> + </li><li {% if current[1] == 'download' %}class='current'{% endif %}><a href="{{ relative_root }}/download">Download</a> + </li><li {% if current[1] == 'support' %}class='current'{% endif %}><a href="{{ relative_root }}/support">Support</a> + </li><li {% if current[1] == 'contribute' %}class='current'{% endif %}><a href="{{ relative_root }}/contribute">Contribute</a> + </li><li {% if current[1] == 'documentation' %}class='current'{% endif %}><a href="{{ relative_root }}/documentation">Documentation</a> + </li><li {% if current[1] == 'blog' %}class='current'{% endif %}><a href="{{ relative_root }}/blog">Blog</a></li> </ul> </nav>
_includes/relative_root.html new file +12 -0
@@ -0,0 +1,12 @@ +{% assign relative_root = '' %} +{% assign tempDepth = page.url | append: 'hackish-solution' | split: '/' | size | minus: 2 %} +{% for i in (1..tempDepth) %} + {% if forloop.last %} + {% assign relative_root = relative_root | append: ".." %} + {% else %} + {% assign relative_root = relative_root | append: "../" %} + {% endif %} +{% endfor %} +{% if relative_root == '' %} + {% assign relative_root = '.' %} +{% endif %}
_includes/sidebar.html +3 -3
@@ -9,7 +9,7 @@ <ul class="style"> {% for post in site.posts offset: 0 limit: 2 %} <li> - <a href="{{ site.prefix }}{{ post.url }}">{{ post.title }}</a><br/> + <a href="{{ relative_root }}{{ post.url }}">{{ post.title }}</a><br/> <span class="posted">{{ post.date | date_to_string }}</span> </li> {% endfor %}
@@ -31,12 +31,12 @@ {% assign thisurl = post.date | date: "%Y/%m" %} {% assign thisdate = post.date | date: "%B %Y" %} {% if thisurl != prevurl and prevurl != "" %} - <li><a href="/blog/{{ prevurl }}/">{{ prevdate }} ({{ counter }})</a></li> + <li><a href="{{ relative_root }}/blog/{{ prevurl }}/">{{ prevdate }} ({{ counter }})</a></li> {% assign counter = 0 %} {% endif %} {% assign counter = counter | plus: 1 %} {% endfor %} - <li><a href="/blog/{{ thisurl }}/">{{ thisdate }} ({{ counter }})</a></li> + <li><a href="{{ relative_root }}/blog/{{ thisurl }}/">{{ thisdate }} ({{ counter }})</a></li> </ul> </section> </div>
_layouts/archive.html +2 -2
@@ -9,13 +9,13 @@ layout: blog {% for post in page.posts %} <article> <header> - <h2><a href="{{ site.prefix }}{{ post.url }}">{{ post.title }}</a></h2> + <h2><a href="../../..{{ post.url }}">{{ post.title }}</a></h2> <div class="posted">{{ post.date | date_to_string }}{% if post.last_modified_at %} (Updated {{ post.last_modified_at | date_to_string }}) {% endif %}{% if post.author %} — by {{ post.author }}{% endif %}</div> </header> {{ post.excerpt }} - <a href="{{ site.prefix }}{{ post.url }}" class="button button-style1">Read More</a> + <a href="../../..{{ post.url }}" class="button button-style1">Read More</a> </article> {% endfor %} </section>
_layouts/blog.html +2 -1
@@ -3,7 +3,8 @@ Linear by TEMPLATED templated.co @templatedco Released for free under the Creative Commons Attribution 3.0 license (templated.co/license) ---> + --> +{% include relative_root.html %} <html> <head> <title>{{ page.title }} - {{ site.title }}</title>
_layouts/home.html +1 -0
@@ -4,6 +4,7 @@ Linear by TEMPLATED templated.co @templatedco Released for free under the Creative Commons Attribution 3.0 license (templated.co/license) --> +{% include relative_root.html %} <html> <head> <title>{{ site.title }}</title>
_layouts/page.html +1 -0
@@ -4,6 +4,7 @@ Linear by TEMPLATED templated.co @templatedco Released for free under the Creative Commons Attribution 3.0 license (templated.co/license) --> +{% include relative_root.html %} <html> <head> <title>{{ page.title }} - {{ site.title }}</title>
blog/index.html +2 -2
@@ -8,7 +8,7 @@ layout: blog <div class="row"> <section> <header> - <h1><a href="{{ site.prefix }}{{ post.url }}">{{ post.title }}</a></h1> + <h1><a href="{{ relative_root }}{{ post.url }}">{{ post.title }}</a></h1> <div class="posted">{{ post.date | date_to_string }}{% if post.last_modified_at %} (Updated {{ post.last_modified_at | date_to_string }}) {% endif %}{% if post.author %} — by {{ post.author }}{% endif %}</div>
@@ -22,7 +22,7 @@ layout: blog </ul> {% else %} {{ post.excerpt }} - <a href="{{ site.prefix }}{{ post.url }}" class="button button-style1">Read More</a> + <a href="{{ relative_root }}{{ post.url }}" class="button button-style1">Read More</a> {% endif %} </section> </div>
index.html +3 -2
@@ -3,6 +3,7 @@ title: QEMU layout: home colorbox: True --- +{% include relative_root.html %} <!-- Header --> <div id="header"> <div class="container">
@@ -38,7 +39,7 @@ colorbox: True {% include screenshot.html offset=3 limit=10 %} </section> -<script src="/assets/js/object-fit.js"></script> +<script src="{{ relative_root }}/assets/js/object-fit.js"></script> <script> window.hasColorBox = false; $(window).on("load resize", function() {
@@ -62,7 +63,7 @@ $('.colorbox').on("click.random-namespace", function() { </div> <hr> - <p>QEMU is a member of <a href="/conservancy/">Software Freedom Conservancy</a>.</p> + <p>QEMU is a member of <a href="{{ relative_root }}/conservancy/">Software Freedom Conservancy</a>.</p> </div> </div>
Signature · 1 line
2.26.2
PATCH v2 4/16 Make page header nav narrower
In reply to Daniel P. BerrangéWhen the browser window is narrow, but not yet switched into the mobile layout, the page header nav will line wrap. This breaks layout assumptions resulting in overlapping/obscured text.
This deals with the probem by reducing padding between the links, and shortening "Documentation" to just "Docs".
This avoids the line wrapping, as well as making room for new links in the future.
--- _includes/nav.html | 2 +- assets/css/style-desktop.css | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-)
_includes/nav.html +1 -1
@@ -6,7 +6,7 @@ </li><li {% if current[1] == 'download' %}class='current'{% endif %}><a href="{{ relative_root }}/download">Download</a> </li><li {% if current[1] == 'support' %}class='current'{% endif %}><a href="{{ relative_root }}/support">Support</a> </li><li {% if current[1] == 'contribute' %}class='current'{% endif %}><a href="{{ relative_root }}/contribute">Contribute</a> - </li><li {% if current[1] == 'documentation' %}class='current'{% endif %}><a href="{{ relative_root }}/documentation">Documentation</a> + </li><li {% if current[1] == 'documentation' %}class='current'{% endif %}><a href="{{ relative_root }}/documentation">Docs</a> </li><li {% if current[1] == 'blog' %}class='current'{% endif %}><a href="{{ relative_root }}/blog">Blog</a></li> </ul> </nav>
assets/css/style-desktop.css +2 -1
@@ -237,13 +237,14 @@ { text-align: right; margin: 0; + padding: 0; } #nav > ul > li { display: inline-block; margin: 0; - padding: 0.5em 2em 0.5em 0em; + padding: 0.5em 1em 0.5em 0em; color: #FFF; letter-spacing: 0.06em; text-transform: uppercase;
Signature · 1 line
2.26.2
Re: [qemu-web PATCH v2 04/16] Make page header nav narrower
Quoted 7 lines · Daniel P. Berrangé
When the browser window is narrow, but not yet switched into the mobile layout, the page header nav will line wrap. This breaks layout assumptions resulting in overlapping/obscured text.
This deals with the probem by reducing padding between the links, and shortening "Documentation" to just "Docs".
Quoted 8 lines
This avoids the line wrapping, as well as making room for new links in the future.
Signed-off-by Daniel P. Berrangé <[email protected]>--- _includes/nav.html | 2 +- assets/css/style-desktop.css | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-)
... and pushed it already (I used this patch to test my access to the new repo on gitlab.com instead the old one at qemu.org)
PATCH v2 5/16 Introduce support for "bxslider" jquery add on
In reply to Daniel P. BerrangéThe "bxslider" provides an auto-rotating carosel of images.
--- _includes/assets.html | 4 + assets/css/jquery.bxslider.css | 179 ++++ assets/js/jquery.bxslider.js | 1607 ++++++++++++++++++++++++++++++++ 3 files changed, 1790 insertions(+) create mode 100644 assets/css/jquery.bxslider.css create mode 100644 assets/js/jquery.bxslider.js
_includes/assets.html +4 -0
@@ -24,3 +24,7 @@ <script src="{{ relative_root }}/assets/js/jquery.colorbox.js"></script> <link rel="stylesheet" href="{{ relative_root }}/assets/css/colorbox.css" /> {% endif %} + {% if page.bxslider %} + <script src="{{ relative_root }}/assets/js/jquery.bxslider.js"></script> + <link rel="stylesheet" href="{{ relative_root }}/assets/css/jquery.bxslider.css" /> + {% endif %}
assets/css/jquery.bxslider.css new file +179 -0
179 lines not on this page · raw message
assets/js/jquery.bxslider.js new file +1607 -0
1,607 lines not on this page · raw message
Signature · 1 line
2.26.2
PATCH v2 6/16 Rework display of screenshots to use a carousel slider
In reply to Daniel P. BerrangéWe have a number of screenshots to display, with three fitted across the width of the screen. The screenshots dominate the usage of screen real estate on the front page, with other relevant information off the bottom of the page.
As a step towards increasing the information density of the home screen replace the horizontally presented screenshots with a rotating carousel of images.
--- _data/screenshots.yml | 14 ++++++++++++-- _includes/screenshot.html | 8 ++++++-- assets/css/style.css | 10 +++++++--- index.html | 36 ++++++++++++++++-------------------- 4 files changed, 41 insertions(+), 27 deletions(-)
_data/screenshots.yml +12 -2
@@ -3,18 +3,28 @@ author: "Screenshot by [User:Nurnware](https://commons.wikimedia.org/wiki/User:Nurnware)" description: "QEMU running the ReactOS operating system on Linux." description_md: "QEMU running the [ReactOS](http://www.reactos.org) operating system on Linux." -- file: qemu-arm.png - description: "QEMU running a 32-bit ARM binary on a 64-bit Linux system." + heading: Full-system emulation + blurb: Run operating systems for any machine, on any supported architecture - file: qemu-advent-calendar-osv-redis.png source: http://www.qemu-advent-calendar.org/#day-11 author: "Courtesy of Dor Laor" description: "The dashboard of the OSv operating system, running in the background as a QEMU/KVM process." description_md: "The dashboard of the [OSv](http://osv.io) operating system, running in the background as a QEMU/KVM process." + heading: Virtualization + blurb: Run KVM and Xen virtual machines with near native performance +- file: qemu-arm.png + description: "QEMU running a 32-bit ARM binary on a 64-bit Linux system." + heading: User-mode emulation + blurb: Run programs for another Linux/BSD target, on any supported architecture - file: qemu-advent-calendar-s390-moon-buggy.png source: http://www.qemu-advent-calendar.org/#day-22 author: "Courtesy of Alexander Graf" description: "QEMU emulating an ASCII art game for the System z (s390) mainframe." + heading: Full-system emulation + blurb: Run operating systems for non-native architectures - file: qemu-advent-calendar-second-reality.png source: http://www.qemu-advent-calendar.org/#day-13 author: "Courtesy of Paolo Bonzini" description: "QEMU running Second Reality, a well-known PC demo from 1993, inside the FreeDOS operating system." + heading: Full-system emulation + blurb: Run demos written for classic / obsolete operating systems
_includes/screenshot.html +6 -2
@@ -1,9 +1,13 @@ {% for screenshot in site.data.screenshots offset: {{include.offset}} limit: {{include.limit}} %} -<a href="screenshots/{{screenshot.file}}" class="colorbox" +<section> + {% if screenshot.heading %}<h3>{{ screenshot.heading }}</h3>{% endif %} + <div class="pennant"><a href="screenshots/{{screenshot.file}}" class="colorbox" title="{{screenshot.description}}" data-title="{% if screenshot.description_md %}{{screenshot.description_md | markdownify | remove: '<p>' | remove: '</p>' | strip_newlines | escape}}{% else %}{{screenshot.description}}{%endif %}{% if screenshot.author %} {{screenshot.author | markdownify | remove: '<p>' | remove: '</p>' | strip_newlines | escape}} {% endif %}{% if screenshot.source %} (<a href="{{screenshot.source}}">Source</a>){%endif %}"><img - src="screenshots/{{screenshot.file}}" alt="Screenshot: {{screenshot.description}}"/></a> + src="screenshots/{{screenshot.file}}" alt="Screenshot: {{screenshot.description}}"/></a></div> + {% if screenshot.blurb %}<p>{{ screenshot.blurb }}</p>{% endif %} +</section> {% endfor %}
assets/css/style.css +7 -3
@@ -557,13 +557,14 @@ #featured header { border-bottom: 1px solid #333333; + margin-bottom: 0.5em; } #featured h2 { margin-bottom: 0em; } - #featured h3 + #featured .screenshots h3 { padding: 1.5em 0em; font-size: 1.6em;
@@ -573,12 +574,15 @@ margin: 0em 0em 1em 0em; } - #featured .pennant + #featured .screenshots .pennant { font-size: 4em; + width: 40%; + margin-left: auto; + margin-right: auto; } - #featured .pennant img + #featured .screenshots .pennant img { width: 100%; object-fit: contain;
index.html +16 -20
@@ -2,6 +2,7 @@ title: QEMU layout: home colorbox: True +bxslider: True --- {% include relative_root.html %} <!-- Header -->
@@ -19,25 +20,9 @@ colorbox: True <h2>What is QEMU?</h2> <p>QEMU is a generic and open source machine emulator and virtualizer.</p> </header> - <div class="row"> - <section class="4u"> - <div class="pennant">{% include screenshot.html offset=0 limit=1 %}</div> - <h3>Full-system<br class="only-desktop"> emulation</h3> - <p>Run operating systems for any machine, on any supported architecture</p> - </section> - <section class="4u"> - <div class="pennant">{% include screenshot.html offset=1 limit=1 %}</div> - <h3>User-mode<br class="only-desktop"> emulation</h3> - <p>Run programs for another Linux/BSD target, on any supported architecture</p> - </section> - <section class="4u"> - <div class="pennant">{% include screenshot.html offset=2 limit=1 %}</div> - <h3>Virtualization</h3> - <p>Run KVM and Xen virtual machines with near native performance</p> - </section> - <section style="display: none;"> - {% include screenshot.html offset=3 limit=10 %} - </section> + <div class="row slider screenshots"> + {% include screenshot.html %} + </div> <script src="{{ relative_root }}/assets/js/object-fit.js"></script> <script>
@@ -59,9 +44,20 @@ $(window).on("load resize", function() { $('.colorbox').on("click.random-namespace", function() { return window.hasColorBox; }) + +$(document).ready(function(){ + $('.slider').bxSlider({ + auto: true, + autoHover: true, + mode: "fade", + infiniteLoop: true, + controls: false, + speed: 500, + pause: 5000, + }); +}); </script> - </div> <hr> <p>QEMU is a member of <a href="{{ relative_root }}/conservancy/">Software Freedom Conservancy</a>.</p> </div>
Signature · 1 line
2.26.2
Re: [qemu-web PATCH v2 06/16] Rework display of screenshots to use a carousel slider
Quoted 9 lines · Daniel P. Berrangé
We have a number of screenshots to display, with three fitted across the width of the screen. The screenshots dominate the usage of screen real estate on the front page, with other relevant information off the bottom of the page.
As a step towards increasing the information density of the home screen replace the horizontally presented screenshots with a rotating carousel of images.
Quoted 7 lines
Signed-off-by Daniel P. Berrangé <[email protected]>--- _data/screenshots.yml | 14 ++++++++++++-- _includes/screenshot.html | 8 ++++++-- assets/css/style.css | 10 +++++++--- index.html | 36 ++++++++++++++++-------------------- 4 files changed, 41 insertions(+), 27 deletions(-)
The carousel slider looks effective; also makes the page a little more cleaner. And I also noticed -- if I click on an image, conveniently enough, the slider lets me rotate through the images manually as well.
Quoted 161 lines
_data/screenshots.yml +12
-2@@ -3,18 +3,28 @@ author: "Screenshot by [User:Nurnware](https://commons.wikimedia.org/wiki/User:Nurnware)" description: "QEMU running the ReactOS operating system on Linux." description_md: "QEMU running the [ReactOS](http://www.reactos.org) operating system on Linux." -- file: qemu-arm.png - description: "QEMU running a 32-bit ARM binary on a 64-bit Linux system." + heading: Full-system emulation + blurb: Run operating systems for any machine, on any supported architecture - file: qemu-advent-calendar-osv-redis.png source: http://www.qemu-advent-calendar.org/#day-11 author: "Courtesy of Dor Laor" description: "The dashboard of the OSv operating system, running in the background as a QEMU/KVM process." description_md: "The dashboard of the [OSv](http://osv.io) operating system, running in the background as a QEMU/KVM process." + heading: Virtualization + blurb: Run KVM and Xen virtual machines with near native performance +- file: qemu-arm.png + description: "QEMU running a 32-bit ARM binary on a 64-bit Linux system." + heading: User-mode emulation + blurb: Run programs for another Linux/BSD target, on any supported architecture - file: qemu-advent-calendar-s390-moon-buggy.png source: http://www.qemu-advent-calendar.org/#day-22 author: "Courtesy of Alexander Graf" description: "QEMU emulating an ASCII art game for the System z (s390) mainframe." + heading: Full-system emulation + blurb: Run operating systems for non-native architectures - file: qemu-advent-calendar-second-reality.png source: http://www.qemu-advent-calendar.org/#day-13 author: "Courtesy of Paolo Bonzini" description: "QEMU running Second Reality, a well-known PC demo from 1993, inside the FreeDOS operating system." + heading: Full-system emulation + blurb: Run demos written for classic / obsolete operating systems_includes/screenshot.html +6
-2@@ -1,9 +1,13 @@ {% for screenshot in site.data.screenshots offset: {{include.offset}} limit: {{include.limit}} %} -<a href="screenshots/{{screenshot.file}}" class="colorbox" +<section> + {% if screenshot.heading %}<h3>{{ screenshot.heading }}</h3>{% endif %} + <div class="pennant"><a href="screenshots/{{screenshot.file}}" class="colorbox" title="{{screenshot.description}}" data-title="{% if screenshot.description_md %}{{screenshot.description_md | markdownify | remove: '<p>' | remove: '</p>' | strip_newlines | escape}}{% else %}{{screenshot.description}}{%endif %}{% if screenshot.author %} {{screenshot.author | markdownify | remove: '<p>' | remove: '</p>' | strip_newlines | escape}} {% endif %}{% if screenshot.source %} (<a href="{{screenshot.source}}">Source</a>){%endif %}"><img - src="screenshots/{{screenshot.file}}" alt="Screenshot: {{screenshot.description}}"/></a> + src="screenshots/{{screenshot.file}}" alt="Screenshot: {{screenshot.description}}"/></a></div> + {% if screenshot.blurb %}<p>{{ screenshot.blurb }}</p>{% endif %} +</section> {% endfor %}assets/css/style.css +7
-3@@ -557,13 +557,14 @@ #featured header { border-bottom: 1px solid #333333; + margin-bottom: 0.5em; } #featured h2 { margin-bottom: 0em; } - #featured h3 + #featured .screenshots h3 { padding: 1.5em 0em; font-size: 1.6em;@@ -573,12 +574,15 @@ margin: 0em 0em 1em 0em; } - #featured .pennant + #featured .screenshots .pennant { font-size: 4em; + width: 40%; + margin-left: auto; + margin-right: auto; } - #featured .pennant img + #featured .screenshots .pennant img { width: 100%; object-fit: contain;index.html +16
-20@@ -2,6 +2,7 @@ title: QEMU layout: home colorbox: True +bxslider: True --- {% include relative_root.html %} <!-- Header -->@@ -19,25 +20,9 @@ colorbox: True <h2>What is QEMU?</h2> <p>QEMU is a generic and open source machine emulator and virtualizer.</p> </header> - <div class="row"> - <section class="4u"> - <div class="pennant">{% include screenshot.html offset=0 limit=1 %}</div> - <h3>Full-system<br class="only-desktop"> emulation</h3> - <p>Run operating systems for any machine, on any supported architecture</p> - </section> - <section class="4u"> - <div class="pennant">{% include screenshot.html offset=1 limit=1 %}</div> - <h3>User-mode<br class="only-desktop"> emulation</h3> - <p>Run programs for another Linux/BSD target, on any supported architecture</p> - </section> - <section class="4u"> - <div class="pennant">{% include screenshot.html offset=2 limit=1 %}</div> - <h3>Virtualization</h3> - <p>Run KVM and Xen virtual machines with near native performance</p> - </section> - <section style="display: none;"> - {% include screenshot.html offset=3 limit=10 %} - </section> + <div class="row slider screenshots"> + {% include screenshot.html %} + </div> <script src="{{ relative_root }}/assets/js/object-fit.js"></script> <script>@@ -59,9 +44,20 @@ $(window).on("load resize", function() { $('.colorbox').on("click.random-namespace", function() { return window.hasColorBox; }) + +$(document).ready(function(){ + $('.slider').bxSlider({ + auto: true, + autoHover: true, + mode: "fade", + infiniteLoop: true, + controls: false, + speed: 500, + pause: 5000, + }); +}); </script> - </div> <hr> <p>QEMU is a member of <a href="{{ relative_root }}/conservancy/">Software Freedom Conservancy</a>.</p> </div>Signature · 1 line
2.26.2
Signature · 1 line
/kashyap
Re: [qemu-web PATCH v2 06/16] Rework display of screenshots to use a carousel slider
In reply to Daniel P. BerrangéQuoted 8 lines · Daniel P. Berrangé
We have a number of screenshots to display, with three fitted across the width of the screen. The screenshots dominate the usage of screen real estate on the front page, with other relevant information off the bottom of the page.
As a step towards increasing the information density of the home screen replace the horizontally presented screenshots with a rotating carousel of images.
Looks good, but the left and right columns are a bit unbalanced. Since you are at it, perhaps you could organize the part below the red strip a bit like the Dolphin home page (https://dolphin-emu.org/):
----------------------------------------------------------
QEMU
Generic, open source emulator and virtualizer
----------------------------------------------------------
Latest release: CAROUSEL
.... . . .
Contribute Recent posts
..... ....
Advent calendar
Blog planet
KVM
Libguestfs
Libvirt
Xen
---------------------------------------------------------
Also, possibly include the excerpt of the first post ({{post.excerpt}}).
Thanks!
Paolo
Quoted 165 lines
Signed-off-by Daniel P. Berrangé <[email protected]>--- _data/screenshots.yml | 14 ++++++++++++-- _includes/screenshot.html | 8 ++++++-- assets/css/style.css | 10 +++++++--- index.html | 36 ++++++++++++++++-------------------- 4 files changed, 41 insertions(+), 27 deletions(-)_data/screenshots.yml +12
-2@@ -3,18 +3,28 @@ author: "Screenshot by [User:Nurnware](https://commons.wikimedia.org/wiki/User:Nurnware)" description: "QEMU running the ReactOS operating system on Linux." description_md: "QEMU running the [ReactOS](http://www.reactos.org) operating system on Linux." -- file: qemu-arm.png - description: "QEMU running a 32-bit ARM binary on a 64-bit Linux system." + heading: Full-system emulation + blurb: Run operating systems for any machine, on any supported architecture - file: qemu-advent-calendar-osv-redis.png source: http://www.qemu-advent-calendar.org/#day-11 author: "Courtesy of Dor Laor" description: "The dashboard of the OSv operating system, running in the background as a QEMU/KVM process." description_md: "The dashboard of the [OSv](http://osv.io) operating system, running in the background as a QEMU/KVM process." + heading: Virtualization + blurb: Run KVM and Xen virtual machines with near native performance +- file: qemu-arm.png + description: "QEMU running a 32-bit ARM binary on a 64-bit Linux system." + heading: User-mode emulation + blurb: Run programs for another Linux/BSD target, on any supported architecture - file: qemu-advent-calendar-s390-moon-buggy.png source: http://www.qemu-advent-calendar.org/#day-22 author: "Courtesy of Alexander Graf" description: "QEMU emulating an ASCII art game for the System z (s390) mainframe." + heading: Full-system emulation + blurb: Run operating systems for non-native architectures - file: qemu-advent-calendar-second-reality.png source: http://www.qemu-advent-calendar.org/#day-13 author: "Courtesy of Paolo Bonzini" description: "QEMU running Second Reality, a well-known PC demo from 1993, inside the FreeDOS operating system." + heading: Full-system emulation + blurb: Run demos written for classic / obsolete operating systems_includes/screenshot.html +6
-2@@ -1,9 +1,13 @@ {% for screenshot in site.data.screenshots offset: {{include.offset}} limit: {{include.limit}} %} -<a href="screenshots/{{screenshot.file}}" class="colorbox" +<section> + {% if screenshot.heading %}<h3>{{ screenshot.heading }}</h3>{% endif %} + <div class="pennant"><a href="screenshots/{{screenshot.file}}" class="colorbox" title="{{screenshot.description}}" data-title="{% if screenshot.description_md %}{{screenshot.description_md | markdownify | remove: '<p>' | remove: '</p>' | strip_newlines | escape}}{% else %}{{screenshot.description}}{%endif %}{% if screenshot.author %} {{screenshot.author | markdownify | remove: '<p>' | remove: '</p>' | strip_newlines | escape}} {% endif %}{% if screenshot.source %} (<a href="{{screenshot.source}}">Source</a>){%endif %}"><img - src="screenshots/{{screenshot.file}}" alt="Screenshot: {{screenshot.description}}"/></a> + src="screenshots/{{screenshot.file}}" alt="Screenshot: {{screenshot.description}}"/></a></div> + {% if screenshot.blurb %}<p>{{ screenshot.blurb }}</p>{% endif %} +</section> {% endfor %}assets/css/style.css +7
-3@@ -557,13 +557,14 @@ #featured header { border-bottom: 1px solid #333333; + margin-bottom: 0.5em; } #featured h2 { margin-bottom: 0em; } - #featured h3 + #featured .screenshots h3 { padding: 1.5em 0em; font-size: 1.6em;@@ -573,12 +574,15 @@ margin: 0em 0em 1em 0em; } - #featured .pennant + #featured .screenshots .pennant { font-size: 4em; + width: 40%; + margin-left: auto; + margin-right: auto; } - #featured .pennant img + #featured .screenshots .pennant img { width: 100%; object-fit: contain;index.html +16
-20@@ -2,6 +2,7 @@ title: QEMU layout: home colorbox: True +bxslider: True --- {% include relative_root.html %} <!-- Header -->@@ -19,25 +20,9 @@ colorbox: True <h2>What is QEMU?</h2> <p>QEMU is a generic and open source machine emulator and virtualizer.</p> </header> - <div class="row"> - <section class="4u"> - <div class="pennant">{% include screenshot.html offset=0 limit=1 %}</div> - <h3>Full-system<br class="only-desktop"> emulation</h3> - <p>Run operating systems for any machine, on any supported architecture</p> - </section> - <section class="4u"> - <div class="pennant">{% include screenshot.html offset=1 limit=1 %}</div> - <h3>User-mode<br class="only-desktop"> emulation</h3> - <p>Run programs for another Linux/BSD target, on any supported architecture</p> - </section> - <section class="4u"> - <div class="pennant">{% include screenshot.html offset=2 limit=1 %}</div> - <h3>Virtualization</h3> - <p>Run KVM and Xen virtual machines with near native performance</p> - </section> - <section style="display: none;"> - {% include screenshot.html offset=3 limit=10 %} - </section> + <div class="row slider screenshots"> + {% include screenshot.html %} + </div> <script src="{{ relative_root }}/assets/js/object-fit.js"></script> <script>@@ -59,9 +44,20 @@ $(window).on("load resize", function() { $('.colorbox').on("click.random-namespace", function() { return window.hasColorBox; }) + +$(document).ready(function(){ + $('.slider').bxSlider({ + auto: true, + autoHover: true, + mode: "fade", + infiniteLoop: true, + controls: false, + speed: 500, + pause: 5000, + }); +}); </script> - </div> <hr> <p>QEMU is a member of <a href="{{ relative_root }}/conservancy/">Software Freedom Conservancy</a>.</p> </div>
PATCH v2 7/16 Compress the two front page headings into one
In reply to Daniel P. BerrangéThe current headings are repetative and waste vertical screen real estate which could hold more useful content.
--- index.html | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-)
index.html +1 -5
@@ -9,17 +9,13 @@ bxslider: True <div id="header"> <div class="container"> <h1>QEMU</h1> - <span class="tag">the FAST! processor emulator</span> + <span class="tag">A generic and open source machine emulator and virtualizer</p> </div> </div> <!-- Featured --> <div id="featured"> <div class="container"> - <header> - <h2>What is QEMU?</h2> - <p>QEMU is a generic and open source machine emulator and virtualizer.</p> - </header> <div class="row slider screenshots"> {% include screenshot.html %} </div>
Signature · 1 line
2.26.2
PATCH v2 8/16 Simplify copyright and integrate into footer
In reply to Daniel P. BerrangéThe copyright information is at the base of the page so logically part of the page footer structure.
--- _includes/copyright.html | 8 -------- _includes/footer.html | 3 +++ _layouts/blog.html | 1 - _layouts/home.html | 1 - _layouts/page.html | 1 - assets/css/style-mobile.css | 2 +- assets/css/style.css | 29 ++++++++++++----------------- 7 files changed, 16 insertions(+), 29 deletions(-) delete mode 100644 _includes/copyright.html
_includes/copyright.html deleted +0 -8
@@ -1,8 +0,0 @@ -<div id="copyright"> - <div id="copyright-inner"> - <div class="container"> - This site is made available under the terms of - <a href="{{ relative_root }}/license.html">a number of licenses</a>. - </div> - </div> -</div>
_includes/footer.html +3 -0
@@ -27,4 +27,7 @@ <li><a href="https://xenproject.org">Xen</a></li> </ul> </div> + <div id="licenses"> + <a href="{{ relative_root }}/license.html">Website licenses</a> + </div> </div>
_layouts/blog.html +0 -1
@@ -21,7 +21,6 @@ Released for free under the Creative Commons Attribution 3.0 license (templated. {% include sidebar.html %} {% include footer.html %} - {% include copyright.html %} </body> </html>
_layouts/home.html +0 -1
@@ -18,7 +18,6 @@ Released for free under the Creative Commons Attribution 3.0 license (templated. {{ content }} {% include footer.html %} - {% include copyright.html %} </body> </html>
_layouts/page.html +0 -1
@@ -23,7 +23,6 @@ Released for free under the Creative Commons Attribution 3.0 license (templated. </div> {% include footer.html %} - {% include copyright.html %} </body> </html>
assets/css/style-mobile.css +1 -1
@@ -242,7 +242,7 @@ /* Columns */ /*********************************************************************************/ - #main, #footer-inner, #copyright-inner + #main, #footer-inner { margin-left: 0%; width: 100%;
assets/css/style.css +12 -17
@@ -428,7 +428,7 @@ /* Columns */ /*********************************************************************************/ - #main, #copyright-inner + #main { margin-left: 16.667%; width: 66.667%;
@@ -523,23 +523,18 @@ margin: 0 } -/*********************************************************************************/ -/* Copyright */ -/*********************************************************************************/ - - #copyright - { - clear: left; - border-top: 1px solid #aaaaaa; - position: relative; - color: #aaaaaa; - background: #ffffff; - padding: 1em 0em; + #licenses { + padding: 0em; + padding-left: 1em; + padding-right: 1em; + font-size: smaller; + color: #401200; + background: #fff; + margin: 1em; } - - #copyright a - { - color: inherit; + + #licenses { + float: right; } /*********************************************************************************/
Signature · 1 line
2.26.2
PATCH v2 9/16 Put a full SFC membership blurb in footer of every page
In reply to Daniel P. Berrangé--- _includes/footer.html | 4 +++- assets/css/style.css | 6 +++++- index.html | 3 --- 3 files changed, 8 insertions(+), 5 deletions(-)
_includes/footer.html +3 -1
@@ -3,7 +3,6 @@ <ul class="style"> <li><a href="{{ relative_root }}/">Home</a></li> <li><a href="{{ relative_root }}/download">Download</a></li> - <li><a href="{{ relative_root }}/conservancy/">Conservancy / Committee</a></li> <li><a href="http://qemu-advent-calendar.org">QEMU advent calendar</a></li> </ul> <ul class="style">
@@ -27,6 +26,9 @@ <li><a href="https://xenproject.org">Xen</a></li> </ul> </div> + <div id="conservancy"> + QEMU is a member of <a href="{{ relative_root }}/conservancy/">Software Freedom Conservancy</a> + </div> <div id="licenses"> <a href="{{ relative_root }}/license.html">Website licenses</a> </div>
assets/css/style.css +5 -1
@@ -523,7 +523,7 @@ margin: 0 } - #licenses { + #licenses, #conservancy { padding: 0em; padding-left: 1em; padding-right: 1em;
@@ -536,6 +536,10 @@ #licenses { float: right; } + + #conservancy { + float: left; + } /*********************************************************************************/ /* Featured */
index.html +0 -3
@@ -53,9 +53,6 @@ $(document).ready(function(){ }); }); </script> - - <hr> - <p>QEMU is a member of <a href="{{ relative_root }}/conservancy/">Software Freedom Conservancy</a>.</p> </div> </div>
Signature · 1 line
2.26.2
PATCH v2 10/16 Use two column layout to display screenshots and releases
In reply to Daniel P. BerrangéNow that the screenshots are using a carousel, they don't consume the full width of the page. This enables switching to a two column layout with information about the latest release placed in one column, and screenshots in the other. This means release information is no longer hidden off the bottom of the page.
--- assets/css/style-desktop.css | 13 +++++++++ assets/css/style-mobile.css | 10 ------- assets/css/style.css | 56 +++++++++++++++++++++++++++++++++--- index.html | 33 ++++++++++++--------- 4 files changed, 85 insertions(+), 27 deletions(-)
assets/css/style-desktop.css +13 -0
@@ -133,6 +133,8 @@ #featured { padding: 3em 0em 1em 0em; + width: 50%; + float: left; } #featured p
@@ -153,6 +155,17 @@ .\31 1u img { height: 66vw; } .\31 2u img { height: 72vw; } +/*********************************************************************************/ +/* Quickstart */ +/*********************************************************************************/ + + #quickstart + { + padding-top: 5em; + width: 50%; + float: right; + } + /*********************************************************************************/ /* Horizontal menu */ /*********************************************************************************/
assets/css/style-mobile.css +0 -10
@@ -49,20 +49,10 @@ background-attachment: fixed; } - #featured - { - padding-top: 250px; - } - @media (min-width:500px) { - body - { - background-image: url(../images/qemu_head_400_faint.png); - } #featured { padding-top: 50px; } - } section, article
assets/css/style.css +52 -4
75 lines not on this page · raw message
index.html +20 -13
@@ -12,11 +12,29 @@ bxslider: True <span class="tag">A generic and open source machine emulator and virtualizer</p> </div> </div> - + +<!-- Main --> +<div id="quickstart"> + <div class="container"> + <ul> +{% for release in site.data.releases offset: 0 limit: 1 %} + <li><strong>Latest release: <a + href="https://download.qemu.org/qemu-{{release.branch}}.{{release.patch}}.tar.xz">{{release.branch}}.{{release.patch}}</a></strong> + <span>{{release.date}} </span> + <span><a href="https://download.qemu.org/qemu-{{release.branch}}.{{release.patch}}.tar.xz.sig">signature</a></span> + <span><a href="https://wiki.qemu.org/ChangeLog/{{release.branch}}">changes</a></span> + <br> + <span><a href="{{ relative_root }}/download">Other releases</a></span> + </li> +{% endfor %} + </ul> + </div> +</div> + <!-- Featured --> <div id="featured"> <div class="container"> - <div class="row slider screenshots"> + <div class="slider screenshots"> {% include screenshot.html %} </div>
@@ -56,17 +74,6 @@ $(document).ready(function(){ </div> </div> -<!-- Main --> - <div id="releases"> - <header> - <h2>Latest releases</h2> - </header> - <div class="container"> - {% include releases.html %} - </div> - </div> - - <script> $(window).on("scroll", function() { isScroll = window.scrollY < 120;
Signature · 1 line
2.26.2
PATCH v2 11/16 Bring contribution links out of the footer into the home page
In reply to Daniel P. BerrangéThe selection of contribution links are important information to present to visitors to the site. They are best placed in a prominent position on the home page rather than in the footer
--- _includes/footer.html | 7 ------- index.html | 8 ++++++++ 2 files changed, 8 insertions(+), 7 deletions(-)
_includes/footer.html +0 -7
@@ -5,13 +5,6 @@ <li><a href="{{ relative_root }}/download">Download</a></li> <li><a href="http://qemu-advent-calendar.org">QEMU advent calendar</a></li> </ul> - <ul class="style"> - <li><a href="{{ relative_root }}/contribute">Contribute</a></li> - <li><a href="{{ relative_root }}/contribute/report-a-bug">Reporting a bug</a></li> - <li><a href="https://wiki.qemu.org/Documentation/GettingStartedDevelopers">New contributors</a></li> - <li><a href="https://wiki.qemu.org/Contribute/SubmitAPatch">Submitting a patch</a></li> - <li><a href="https://wiki.qemu.org/Contribute/FAQ">Contributor FAQ</a></li> - </ul> <ul class="style"> <li><a href="{{ relative_root }}/documentation">Documentation</a></li> <li><a href="https://www.qemu.org/docs/master/">Main docs</a></li>
index.html +8 -0
@@ -27,6 +27,14 @@ bxslider: True <span><a href="{{ relative_root }}/download">Other releases</a></span> </li> {% endfor %} + + <li><strong>Contribute</strong> + <span><a href="{{ relative_root }}/contribute">Overview</a></span> + <span><a href="{{ relative_root }}/contribute/report-a-bug">Reporting a bug</a></span> + <span><a href="https://wiki.qemu.org/Documentation/GettingStartedDevelopers">New contributors</a></span> + <span><a href="https://wiki.qemu.org/Contribute/SubmitAPatch">Submitting a patch</a></span> + <span><a href="https://wiki.qemu.org/Contribute/FAQ">Contributor FAQ</a></span> + </li> </ul> </div> </div>
Signature · 1 line
2.26.2
Re: [qemu-web PATCH v2 11/16] Bring contribution links out of the footer into the home page
Quoted 5 lines · Daniel P. Berrangé
The selection of contribution links are important information to present to visitors to the site. They are best placed in a prominent position on the home page rather than in the footer
Signed-off-by Daniel P. Berrangé <[email protected]>
Yeah, I personally didn't realize all the useful Contribute-related links that were only one scroll away in the old page vs. having it front and center in your new rendering:
https://berrange.gitlab.io/qemu-web/
Definitely useful.
FWIW:
Quoted 46 lines
--- _includes/footer.html | 7 ------- index.html | 8 ++++++++ 2 files changed, 8 insertions(+), 7 deletions(-)_includes/footer.html +0
-7@@ -5,13 +5,6 @@ <li><a href="{{ relative_root }}/download">Download</a></li> <li><a href="http://qemu-advent-calendar.org">QEMU advent calendar</a></li> </ul> - <ul class="style"> - <li><a href="{{ relative_root }}/contribute">Contribute</a></li> - <li><a href="{{ relative_root }}/contribute/report-a-bug">Reporting a bug</a></li> - <li><a href="https://wiki.qemu.org/Documentation/GettingStartedDevelopers">New contributors</a></li> - <li><a href="https://wiki.qemu.org/Contribute/SubmitAPatch">Submitting a patch</a></li> - <li><a href="https://wiki.qemu.org/Contribute/FAQ">Contributor FAQ</a></li> - </ul> <ul class="style"> <li><a href="{{ relative_root }}/documentation">Documentation</a></li> <li><a href="https://www.qemu.org/docs/master/">Main docs</a></li>index.html +8
-0@@ -27,6 +27,14 @@ bxslider: True <span><a href="{{ relative_root }}/download">Other releases</a></span> </li> {% endfor %} + + <li><strong>Contribute</strong> + <span><a href="{{ relative_root }}/contribute">Overview</a></span> + <span><a href="{{ relative_root }}/contribute/report-a-bug">Reporting a bug</a></span> + <span><a href="https://wiki.qemu.org/Documentation/GettingStartedDevelopers">New contributors</a></span> + <span><a href="https://wiki.qemu.org/Contribute/SubmitAPatch">Submitting a patch</a></span> + <span><a href="https://wiki.qemu.org/Contribute/FAQ">Contributor FAQ</a></span> + </li> </ul> </div> </div>Signature · 1 line
2.26.2
Signature · 1 line
/kashyap
PATCH v2 12/16 Add recent blog posts to the front page featured content
In reply to Daniel P. BerrangéThis makes it more likely that visitors will see and follow links to interesting blogs.
--- assets/css/style.css | 5 +++++ index.html | 12 ++++++++++++ 2 files changed, 17 insertions(+)
assets/css/style.css +5 -0
@@ -627,6 +627,11 @@ display: block; padding-bottom: 2em; } + + #quickstart ul.blogs > li + { + padding-bottom: 0.5em; + } #quickstart ul > li > strong {
index.html +12 -0
@@ -35,6 +35,18 @@ bxslider: True <span><a href="https://wiki.qemu.org/Contribute/SubmitAPatch">Submitting a patch</a></span> <span><a href="https://wiki.qemu.org/Contribute/FAQ">Contributor FAQ</a></span> </li> + + <li><strong>Recent posts</strong> + <ul class="blogs"> + {% for post in site.posts offset: 0 limit: 4 %} + <li><a href="{{ relative_root }}{{ post.url }}">{{ post.title }}</a><br> + <div class="posted">{{ post.date | date_to_string }}{% + if post.last_modified_at %} (Updated {{ post.last_modified_at | date_to_string }}) {% + endif %}{% if post.author %} — by {{ post.author }}{% endif %} + </li> + {% endfor %} + </ul> + </li> </ul> </div> </div>
Signature · 1 line
2.26.2
PATCH v2 13/16 Move wiki link from footer into the header navbar
In reply to Daniel P. BerrangéThe wiki is important enough that it should be presented more prominently in the page header navbar, rather than the footer.
--- _includes/footer.html | 1 - _includes/nav.html | 1 + 2 files changed, 1 insertion(+), 1 deletion(-)
_includes/footer.html +0 -1
@@ -9,7 +9,6 @@ <li><a href="{{ relative_root }}/documentation">Documentation</a></li> <li><a href="https://www.qemu.org/docs/master/">Main docs</a></li> <li><a href="https://wiki.qemu.org/Category:Developer_documentation">Developer docs</a></li> - <li><a href="https://wiki.qemu.org/">Wiki</a></li> </ul> <ul class="style"> <li><a href="https://planet.virt-tools.org/">virt tools planet</a></li>
_includes/nav.html +1 -0
@@ -7,6 +7,7 @@ </li><li {% if current[1] == 'support' %}class='current'{% endif %}><a href="{{ relative_root }}/support">Support</a> </li><li {% if current[1] == 'contribute' %}class='current'{% endif %}><a href="{{ relative_root }}/contribute">Contribute</a> </li><li {% if current[1] == 'documentation' %}class='current'{% endif %}><a href="{{ relative_root }}/documentation">Docs</a> + </li><li><a href="https://wiki.qemu.org">Wiki</a> </li><li {% if current[1] == 'blog' %}class='current'{% endif %}><a href="{{ relative_root }}/blog">Blog</a></li> </ul> </nav>
Signature · 1 line
2.26.2
PATCH v2 14/16 Simplify and restructure the page footer
In reply to Daniel P. BerrangéRemove links from the footer than duplicate what is already present in the header navbar or easily found from other places. The footer bar is now simply a selection of links to related external sites, along with the website license and SFC information.
--- _includes/footer.html | 15 +++------------ assets/css/style-desktop.css | 21 +-------------------- assets/css/style-mobile.css | 22 +--------------------- assets/css/style.css | 24 ++++++++++++++++-------- 4 files changed, 21 insertions(+), 61 deletions(-)
_includes/footer.html +3 -12
@@ -1,17 +1,8 @@ <div id="footer"> - <div id="footer-inner"> + <div id="external-links"> <ul class="style"> - <li><a href="{{ relative_root }}/">Home</a></li> - <li><a href="{{ relative_root }}/download">Download</a></li> - <li><a href="http://qemu-advent-calendar.org">QEMU advent calendar</a></li> - </ul> - <ul class="style"> - <li><a href="{{ relative_root }}/documentation">Documentation</a></li> - <li><a href="https://www.qemu.org/docs/master/">Main docs</a></li> - <li><a href="https://wiki.qemu.org/Category:Developer_documentation">Developer docs</a></li> - </ul> - <ul class="style"> - <li><a href="https://planet.virt-tools.org/">virt tools planet</a></li> + <li><a href="http://qemu-advent-calendar.org">Advent calendar</a></li> + <li><a href="https://planet.virt-tools.org/">Blog planet</a></li> <li><a href="https://www.linux-kvm.org/">KVM</a></li> <li><a href="http://libguestfs.org/">Libguestfs</a></li> <li><a href="https://libvirt.org/">Libvirt</a></li>
assets/css/style-desktop.css +1 -20
@@ -104,26 +104,7 @@ #footer { - padding: 1em 0em; - } - - #footer-inner - { - width: 95%; - display: table; - margin: auto; - } - - #footer ul - { - width: 25%; - display: table-cell; - padding-left: 2em; - } - - #footer ul:first-child - { - padding-left: 0px; + clear: both; } /*********************************************************************************/
assets/css/style-mobile.css +1 -21
@@ -232,7 +232,7 @@ /* Columns */ /*********************************************************************************/ - #main, #footer-inner + #main { margin-left: 0%; width: 100%;
@@ -267,26 +267,6 @@ font-size: 1.6em; } -/*********************************************************************************/ -/* Footer */ -/*********************************************************************************/ - - #footer - { - padding: 1em; - } - - #footer ul - { - padding: 0.6em 0px; - border-top: 1px solid white; - } - - #footer ul:first-child - { - border-top: 0px; - } - /*********************************************************************************/ /* Featured */ /*********************************************************************************/
assets/css/style.css +16 -8
@@ -502,9 +502,6 @@ #footer { position: relative; - clear: left; - background: #401200; - color: #FFF; } #footer a
@@ -514,13 +511,24 @@ #footer ul { - vertical-align: top; + margin: 0em; } - #footer ul, #footer ul > li - { - padding: 0; - margin: 0 + #external-links { + padding: 0em; + padding-top: 0.3em; + padding-bottom: 0.3em; + background: #401200; + color: #FFF; + text-align: center; + } + + #external-links li { + display: inline; + } + + #external-links li a { + padding-left: 1em; } #licenses, #conservancy {
Signature · 1 line
2.26.2
PATCH v2 15/16 Add link to "page source" for all pages
In reply to Daniel P. BerrangéThe link takes the user directly to the source markdown file in gitlab. This gives them guidance as to what file should be editted to make changes to the content.
--- _includes/footer.html | 3 +++ assets/css/style.css | 6 +++++- 2 files changed, 8 insertions(+), 1 deletion(-)
_includes/footer.html +3 -0
@@ -1,4 +1,7 @@ <div id="footer"> + <div id="edit-page"> + <a href="https://gitlab.com/qemu-project/qemu-web/-/blob/master/{{page.path}}">page source</a> + </div> <div id="external-links"> <ul class="style"> <li><a href="http://qemu-advent-calendar.org">Advent calendar</a></li>
assets/css/style.css +5 -1
@@ -531,7 +531,11 @@ padding-left: 1em; } - #licenses, #conservancy { + #edit-page { + text-align: right; + } + + #licenses, #conservancy, #edit-page { padding: 0em; padding-left: 1em; padding-right: 1em;
Signature · 1 line
2.26.2
PATCH v2 16/16 Add a CONTRIBUTING.md file as guidance for contributors
In reply to Daniel P. Berrangé--- CONTRIBUTING.md | 32 ++++++++++++++++++++++++++++++++ _config.yml | 1 + 2 files changed, 33 insertions(+) create mode 100644 CONTRIBUTING.md
CONTRIBUTING.md new file +32 -0
@@ -0,0 +1,32 @@ +# Contributing to qemu-web + +The QEMU project accepts code contributions to the website as patches sent to +the the developer mailing list: + +https://lists.nongnu.org/mailman/listinfo/qemu-devel + +For further guidance on sending patches consult: + +https://wiki.qemu.org/Contribute/SubmitAPatch + +It is expected that contributors check the rendered website before submitting +patches. This is possible by either running jekyll locally, or by using the +GitLab CI and Pages infrastructure. + +Any branch that is pushed to a GitLab fork will result in a CI job being run +visible at + +https://gitlab.com/yourusername/qemu-web/-/pipelines + +The rendered result can be then viewed at + +https://yourusername.gitlab.io/qemu-web + +Contributions submitted to the project must be in compliance with the +Developer Certificate of Origin Version 1.1. This is documented at: + +https://developercertificate.org/ + +To indicate compliance, each commit in a series must have a "Signed-off-by" +tag with the submitter's name and email address. This can be added by passing +the ``-s`` flag to ``git commit`` when creating the patches.
_config.yml +1 -0
@@ -40,3 +40,4 @@ exclude: - Gemfile.lock - vendor/ - README + - CONTRIBUTING.md
Signature · 1 line
2.26.2
I am going to apply patches 1-3, so that I can play with doing the final deployment via gitlab pipelines.
Quoted 101 lines · Daniel P. Berrangé
This is a v2 of:
https://lists.gnu.org/archive/html/qemu-devel/2020-10/msg07025.html
This series started off as a desire to add an "Edit page" link to every page on the site. In doing this I felt that the footer would benefit from simplication so that it was not a massive wall of links, duplicating links elsewhere in the navigation or content pages. Then after response to v1, I realized that the home page actually needed alot more design work to better present information to contributors immediately.
The key theme was to ensure that the home page of the website has all the important information available on screen without requiring the user to scroll down or otherwise search for it.
I also add gitlab CI jobs so that users can push a branch to gitlab and then browse the rendered result.
eg see this pipeline:
https://gitlab.com/berrange/qemu-web/-/pipelines/208194087
and the rendered result of this series:
https://berrange.gitlab.io/qemu-web/
Or browsable at
https://gitlab.com/berrange/qemu-web/-/jobs/814392582/artifacts/browse/publ=
ic/Or download ZIP at
https://gitlab.com/berrange/qemu-web/-/jobs/814392582/artifacts/download
notice how the resulting content needs to cope with being used from a variety of different paths. IOW, we cannot use absolute hyperlinks that assume the root is "/". Jekyll doesn't make this easy, so we use a hack with a custom template that sets a variable we can then reference.
The logical next step for this would be to accept merge requests, so that once the user saves their edits in gitlab, they can directly submit a MR, instead of sending via email. I noticed we don't currently have a CONTRIBUTING.md file in qemu-web.git telling people how to submit. So this series includes such a file directing people to send patches via email for now.
Daniel P. Berrang=C3=A9 (16):
Convert files to UNIX line endings
gitlab: introduce a CI job to publish the site content make all links be relative to the root
Make page header nav narrower
Introduce support for "bxslider" jquery add on Rework display of screenshots to use a carousel slider Compress the two front page headings into one Simplify copyright and integrate into footer
Put a full SFC membership blurb in footer of every page Use two column layout to display screenshots and releases Bring contribution links out of the footer into the home page Add recent blog posts to the front page featured content Move wiki link from footer into the header navbar Simplify and restructure the page footer
Add link to "page source" for all pages
Add a CONTRIBUTING.md file as guidance for contributors.gitlab-ci.yml | 16 + CONTRIBUTING.md | 32 + _config.yml | 1 + _data/screenshots.yml | 14 +- _includes/assets.html | 32 +- _includes/copyright.html | 8 - _includes/footer.html | 33 +- _includes/nav.html | 13 +- _includes/relative_root.html | 12 + _includes/screenshot.html | 8 +- _includes/sidebar.html | 6 +- _layouts/archive.html | 4 +- _layouts/blog.html | 4 +- _layouts/home.html | 2 +- _layouts/page.html | 2 +- assets/css/jquery.bxslider.css | 179 ++++ assets/css/style-desktop.css | 581 ++++++------ assets/css/style-mobile.css | 720 +++++++------- assets/css/style.css | 1252 +++++++++++++------------ assets/js/jquery.bxslider.js | 1607 ++++++++++++++++++++++++++++++++ blog/index.html | 4 +- index.html | 195 ++-- 22 files changed, 3312 insertions(+), 1413 deletions(-) create mode 100644 .gitlab-ci.yml create mode 100644 CONTRIBUTING.md delete mode 100644 _includes/copyright.html create mode 100644 _includes/relative_root.html create mode 100644 assets/css/jquery.bxslider.css create mode 100644 assets/js/jquery.bxslider.js--=20
2.26.2
Quoted 2 lines · Paolo Bonzini
I am going to apply patches 1-3, so that I can play with doing the final deployment via gitlab pipelines.
Probably worth taking the 16th patch too, since the CONTRIBUTING file described how to use the CI results.
Quoted 99 lines · Daniel P. Berrangé
Quoted 97 lines
This is a v2 of:
https://lists.gnu.org/archive/html/qemu-devel/2020-10/msg07025.html
This series started off as a desire to add an "Edit page" link to every page on the site. In doing this I felt that the footer would benefit from simplication so that it was not a massive wall of links, duplicating links elsewhere in the navigation or content pages. Then after response to v1, I realized that the home page actually needed alot more design work to better present information to contributors immediately.
The key theme was to ensure that the home page of the website has all the important information available on screen without requiring the user to scroll down or otherwise search for it.
I also add gitlab CI jobs so that users can push a branch to gitlab and then browse the rendered result.
eg see this pipeline:
https://gitlab.com/berrange/qemu-web/-/pipelines/208194087
and the rendered result of this series:
https://berrange.gitlab.io/qemu-web/
Or browsable at
https://gitlab.com/berrange/qemu-web/-/jobs/814392582/artifacts/browse/publ=
ic/Or download ZIP at
https://gitlab.com/berrange/qemu-web/-/jobs/814392582/artifacts/download
notice how the resulting content needs to cope with being used from a variety of different paths. IOW, we cannot use absolute hyperlinks that assume the root is "/". Jekyll doesn't make this easy, so we use a hack with a custom template that sets a variable we can then reference.
The logical next step for this would be to accept merge requests, so that once the user saves their edits in gitlab, they can directly submit a MR, instead of sending via email. I noticed we don't currently have a CONTRIBUTING.md file in qemu-web.git telling people how to submit. So this series includes such a file directing people to send patches via email for now.
Daniel P. Berrang=C3=A9 (16):
Convert files to UNIX line endings
gitlab: introduce a CI job to publish the site content make all links be relative to the root
Make page header nav narrower
Introduce support for "bxslider" jquery add on Rework display of screenshots to use a carousel slider Compress the two front page headings into one Simplify copyright and integrate into footer
Put a full SFC membership blurb in footer of every page Use two column layout to display screenshots and releases Bring contribution links out of the footer into the home page Add recent blog posts to the front page featured content Move wiki link from footer into the header navbar Simplify and restructure the page footer
Add link to "page source" for all pages
Add a CONTRIBUTING.md file as guidance for contributors.gitlab-ci.yml | 16 + CONTRIBUTING.md | 32 + _config.yml | 1 + _data/screenshots.yml | 14 +- _includes/assets.html | 32 +- _includes/copyright.html | 8 - _includes/footer.html | 33 +- _includes/nav.html | 13 +- _includes/relative_root.html | 12 + _includes/screenshot.html | 8 +- _includes/sidebar.html | 6 +- _layouts/archive.html | 4 +- _layouts/blog.html | 4 +- _layouts/home.html | 2 +- _layouts/page.html | 2 +- assets/css/jquery.bxslider.css | 179 ++++ assets/css/style-desktop.css | 581 ++++++------ assets/css/style-mobile.css | 720 +++++++------- assets/css/style.css | 1252 +++++++++++++------------ assets/js/jquery.bxslider.js | 1607 ++++++++++++++++++++++++++++++++ blog/index.html | 4 +- index.html | 195 ++-- 22 files changed, 3312 insertions(+), 1413 deletions(-) create mode 100644 .gitlab-ci.yml create mode 100644 CONTRIBUTING.md delete mode 100644 _includes/copyright.html create mode 100644 _includes/relative_root.html create mode 100644 assets/css/jquery.bxslider.css create mode 100644 assets/js/jquery.bxslider.js
Quoted 5 lines
Quoted 4 lines
--=20
2.26.2
Regards,
Daniel
Signature · 3 lines
|: https://berrange.com -o- https://www.flickr.com/photos/dberrange :| |: https://libvirt.org -o- https://fstop138.berrange.com :| |: https://entangle-photo.org -o- https://www.instagram.com/dberrange :|
Quoted 6 lines · Daniel P. Berrangé
Quoted 2 lines · Paolo Bonzini
I am going to apply patches 1-3, so that I can play with doing the final deployment via gitlab pipelines.
Probably worth taking the 16th patch too, since the CONTRIBUTING file described how to use the CI results.
Done, thanks!
Paolo